Submitted patch for bug 1000803
Filed bug 1000811