Automated module update: Wed Nov 13 13:45:07 NZDT 2013
Automated module update: Wed Nov 13 13:55:19 NZDT 2013
Automated module update: Wed Nov 13 14:00:04 NZDT 2013
Automated module update: Wed Nov 13 14:05:05 NZDT 2013
Automated module update: Wed Nov 13 14:10:04 NZDT 2013
Automated module update: Wed Nov 13 14:35:04 NZDT 2013
Merge branch 'master' into develop