Commit 2014021b201e3af4c5bf132fbf1bce5fb6148e21

Vicent Marti 2011-09-19T05:41:00

Backport t18 fixes to Clay