Merge pull request #291 from buddycloud/dev-candy

Recent stable commits to dev-candy