Merge remote-tracking branch 'remotes/kraxel/tags/fixes-31-20181127-pull-request...