Submitted patch for bug 1000811
Submitted patch for bug 1000853 (and bug 1000854)