fixed filename to make tests/build,html work
Merge branch 'staeff-master' into develop