Fixes #1198
Merge pull request #1199 from seanpaultaylor/next

Fixes #1198
Merge remote-tracking branch 'upstream/next' into next

Conflicts:
	tools/encoder/src/TTFFontEncoder.cpp