Fix merge conflict#693

nickretallack wants to merge 5 commits intooctalmage:masteroctalmage/robotjs:masterfrom

cryptagon:fix-merge-conflictcryptagon/robotjs:fix-merge-conflictCopy head branch name to clipboard