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