Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2018-04-16' into staging