Merge branch 'master' into dev
Merge branch 'master' into dev
Updating php-font-lib to 0.2.2
Remove pre-processing of PHP code, disallow I/O streams as file input
Merge branch 'dev'