Merge branch 'release' of https://github.com/cordjs/core into release
Merge branch 'release' into r1411
Merge branch 'r1411'