Fix Linux Debug build
Merge pull request #1040 from stelth/master

Fix Linux debug build.
Merge pull request #1041 from blackberry/master

Merged master to next