Something to make smyers happy
Merge pull request #1079 from psav/make_smyers_happy

Something to make smyers happy