Merge remote-tracking branch 'mreitz/tags/pull-block-for-kevin-2016-07-13' into queue...