Fix for #3498.
Merge pull request #3620 from Segrain/master

Bugfix.
Merge pull request #3 from Baystation12/master

Update zylowalsh from upstream - 8:32PM 1 Sept 2013