Merge pull request #777 from blackberry/master

Rebase master to next
Merge pull request #783 from blackberry/master

Rebase master to next
Merge branch 'next' of https://github.com/blackberry/GamePlay