Merge remote-tracking branch 'rudi/master'

* rudi/master:
  avoid warning on broken gcc compilers