WIP
Merge branch 'master' into couchpulse
update couchpulse ref
Merge branch 'couchpulse' into rebuild-staging