swat.
Merge pull request #1222 from jrogelstad/22341

swat.