Bug 827023 r=vingtetun
Bug 827772 - Followup to the patch in Bug 824695 r=jst
Backed out changeset f3a6aff3dbbc (bug 827188) because of build failures

--HG--
extra : rebase_source : 87d6ba184e23dbe83a3a0e2ae83c44c5ecdb46db