Merging https://github.com/buddycloud/buddycloud-server-java/pull/79.