Andrew Lewman
patch from jmtodaro for everything in ticket 4590.
Andrew Lewman commited 87c425b7a at 2012-04-25 06:41:44