Automated module update: Fri Nov  1 13:52:41 NZDT 2013
Automated module update: Fri Nov  1 15:30:04 NZDT 2013
Merge branch 'develop'