Merge pull request #784 from seanpaultaylor/master

Fixes #774
Merge branch 'master' of https://github.com/blackberry/GamePlay