Merge remote-tracking branch 'remotes/armbru/tags/pull-monitor-2015-06-22' into staging