Anonymous - 2011-12-13

patch against 1.31 branch, rev. 131