Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2018-02-07-v4' into staging