Merge pull request #291 from buddycloud/dev-candy

Recent stable commits to dev-candy
Merge pull request #292 from buddycloud/master

Merge pull request #291 from buddycloud/dev-candy