Merge branch 'master' into develop
Merge branch 'hotfix/concatenation-script-ending-fix' into develop
Merge branch 'hotfix/ignore-protocol' into develop
Updated to ignore protocol for local script comparison
Merge branch 'hotfix/ignore-protocol' into develop
Silence general PHP warnings, only send to error_log
Updated to ensure that scripts are set disabled in the database in the edge case that all scripts are found to be disabled.
Merge branch 'release/1.1.5'