Swat.
Merge pull request #336 from jrogelstad/20212

Swat.