Automated module update: Tue Nov 19 10:28:54 NZDT 2013
merge