Merge branch 'cgfrost-master'