Issue/PR #2997
Microfix

cleaned `return true; return true;` construction
Removed BOM
Merge pull request #2998 from etki/develop

Microfix
Really fix #2997