Merge branch 'develop'
Merge pull request #1 from OM4/develop

Add the ability to disable the PHP Code execution feature
Merge remote-tracking branch 'upstream/master' into develop