fixes mergeconflict

Armin Felderrequested to merge
smallfix into master

Merge request reports

gitlab project and software management by fairkom.eu - more open source web apps at fairapps.net