Git commits in Moodle 3.0.6 by sam marshall

commit 599e1a877bdceec5afc080b3218b6d51fd9363fa
Author: sam marshall <s.marshall@open.ac.uk>
Date:   Fri, 26 Aug 2016 00:04:11 +0800
Tag:    v3.0.6

MDL-55724 Glossary: Prevent infinite loop in trusttext_strip


commit d34fa71df400463a6ad2feeebe077b9c70761894
Author: sam marshall <s.marshall@open.ac.uk>
Date:   Fri, 19 Aug 2016 19:56:42 +0800
Tag:    v3.0.6

MDL-55628 Completion: Use simpledata for completion cache