Git commits in Moodle 3.1.2 by sam marshall

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

MDL-55724 Glossary: Prevent infinite loop in trusttext_strip

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

MDL-55628 Completion: Use simpledata for completion cache