Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2018-03-26' into staging