Added @chuckharmston for kickass bug squashing in #1272