Cleanup commit b20e0a2c

Claus-Justus Heine requested to merge bugfix/maybe-unused-attribute-warning into master Nov 11, 2018