Bug 1016885 - v1.4 uplift