Merge branch 'm36_MDL-61702_MariaDB_InnoDB10d3d1_Params_Removed' of https://github...
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 Jun 2018 00:00:23 +0000 (08:00 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Jun 2018 09:16:25 +0000 (11:16 +0200)

Trivial merge