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