Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2016-09-20' into staging