Fixes issue #215
Merge branch 'master' of https://github.com/buddycloud/webclient