v.2.1.3-beta1
Merge branch 'master' into MOODLE_26
fixed #57