Merge pull request #1010 from blackberry/next

GamePlay v1.7.0 - merged next to master
Merge branch 'master' of git://github.com/blackberry/GamePlay into oculus