Submitted patch for bug 964367 + mach issues