Merge branch '44154-27' of git://github.com/samhemelryk/moodle

diff --cc mod/data/edit.php
Simple merge

diff --cc mod/data/field.php
Simple merge

diff --cc mod/data/index.php
Simple merge

diff --cc mod/data/lang/en/data.php
Simple merge

diff --cc mod/data/lib.php
Simple merge

diff --cc mod/data/templates.php
Simple merge