Merge branch 'dev' of https://github.com/garvankeeley/MozStumbler into 1006-npe