Merging commits from @bill from branch 'maker-camp'