Merge branch 'MDL-60824-master-profilefield' of git://github.com/mudrd8mz/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 20 Nov 2017 07:04:08 +0000 (15:04 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 20 Nov 2017 07:04:08 +0000 (15:04 +0800)

Trivial merge