merge 0.3.X
merge 0.3.X

mccarrmb/moztrap,bobsilverberg/moztrap,mozilla/moztrap,mozilla/moztrap,mccarrmb/moztrap,bobsilverberg/moztrap,bobsilverberg/moztrap,mccarrmb/moztrap,shinglyu/moztrap,bobsilverberg/moztrap,mozilla/moztrap,shinglyu/moztrap,mccarrmb/moztrap,shinglyu/moztrap,mozilla/moztrap,mozilla/moztrap,shinglyu/moztrap,mccarrmb/moztrap,shinglyu/moztrap