Bug 1016030 - Fix Mulet's support. r=gaye