Merge remote-tracking branch 'mreitz/tags/pull-block-2016-10-07' into queue-block