Waldo is rolled back to the middle
Merge branch 'master' of https://github.com/buddycloud/buddycloud.com