On: patch update for 3.0.14 & 3.1.6

December 2011