Renamed php_pointer_to_this to php_plugin_template
Merge branch 'master' from github