Merging with buddycloud:master