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