Merge branch 'MDL-58920-calculated-question-edit-name-multilang' of https://github...
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 15 May 2017 05:57:04 +0000 (13:57 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 15 May 2017 05:57:04 +0000 (13:57 +0800)

Trivial merge