Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2015-11-18' into queue...