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