Swat.
Merge pull request #1131 from jrogelstad/master

Swat.