Merge branch 'master' into develop
Remove erroneous lines

Recompile
Merge branch 'develop'