Issue #183 - Merge mozilla refs/pull/186/head (currently 604c1dccade39c08c661854915bec61e72c084b4)