Merge branch 'MDL-60014-master-catcherror-nopermission-annotatepdfcron' of https...
authorDavid Monllao <davidm@moodle.com>
Tue, 3 Jul 2018 13:40:12 +0000 (15:40 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 3 Jul 2018 21:33:01 +0000 (23:33 +0200)

Trivial merge