Merge branch 'w43_MDL-29922_m22_smarty' of git://github.com/skodak/moodle