fixing a merge gone wrong
more files for fixing merge gone wrong
Merge pull request #1523 from marcel-blonk/release-61a

Fixing merge gone wrong