3587 the unpurpling
Merge pull request #1198 from sarken/issue_3587

3587 the unpurpling