Bug 895940 - Mirror mozbase to m-c, r=jhammel