Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2017-04-11' into staging