Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2018-06-18' into staging