Remove pre-processing of PHP code, disallow I/O streams as file input
Merge branch 'develop' into dev