Merge sle 12

`-Wpedantic`: remove "backport". It would be a [backport](https://en.wikipedia.org/wiki/Backporting) if we were merging from master to SLE. This is a trivial merge of a maintenance fix.