Bug 1021969, r=bholley,jaws

--HG--
extra : rebase_source : f8bc835a5bfcd62e1d59b31d75841d1cc6339634