Fix merge between 0.12.x and 0.13.x branches
Fix merge between 0.12.x and 0.13.x branches

kitcambridge/loop-server,mozilla-services/loop-server,magopian/loop-server,magopian/loop-server,kitcambridge/loop-server,mozilla-services/loop-server