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