Git commits in Moodle 3.6.0 by Eric Merrill

commit 1ddf3b6a0f358db56c5e165367b1182149425ec6
Author: Eric Merrill <merrill@oakland.edu>
Date:   Tue, 09 Oct 2018 03:46:28 +0800
Tag:    v3.6.0-beta

MDL-63456 qtype_multichoice: Return a default options object if missing

commit efea3247159965a92e697ccc554bdf38951fd93f
Author: Eric Merrill <merrill@oakland.edu>
Date:   Wed, 26 Sep 2018 11:35:37 +0800
Tag:    v3.6.0-beta

MDL-63456 question: Improve Aiken error handling and multichoice errors