MozStumbler v0.12.0
Merge pull request #396 from cpeterso/v0.12.0

MozStumbler v0.12.0
Merge branch 'master', remote-tracking branch 'upstream/master'