Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2017-09-06' into staging