Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2018-07-11' into staging