Re-rolled patch #3, for 10.1.x. Also I have removed !important and improved t...