fix compiling with FreeType 2.5.1
Version Bump
Merge remote-tracking branch 'origin/rel_2.2'