Merge remote-tracking branch 'remotes/dgilbert/tags/pull-hmp-20180216' into staging