chuckharmston Merge pull request #194 from mozilla/6a68-patch-1