Merge branch 'master' into develop
removed xdebug remote autostart
Merge branch 'develop'