Merge pull request #595 from garvankeeley/master

MozStumbler v0.20.3