Merge branch 'MDL-29173_calc' of git://github.com/andyjdavis/moodle