Merge branch 'brokencalc' of git://github.com/andyjdavis/moodle