Fix merge script bug
Merge branch 'master' of https://github.com/openETCS/openetcs.github.com