Merge pull request #1152 from sgrenier/next

Next-sgrenier
Fixes compile error on Linux introduced by previous commit.
Fixes crash in Font when minimizing windows, introduced by previous commit.

Fixed #1153
Merge branch 'next' of https://github.com/blackberry/GamePlay into next