Patch by Christopher Aillon (caillon@returnzero.com). r1=Christian Reis (kiko@async.com.br),
r2=Zach Lipton (zach@zachlipton.com) though not really needed for this patch.