Merge remote-tracking branch 'remotes/armbru/tags/pull-block-2017-02-21' into staging