Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2019-03-26' into staging