Pull master into jShenk to then recommit back up to Master

Pulling Erics changes down to jShenk to then recommit.