Git commits in Moodle 3.1.1 by Mark Johnson

commit ad1e11c2e40e10e4919f795e158254c312170399
Author: Mark Johnson <mark.johnson@open.ac.uk>
Date:   Tue, 28 Jun 2016 19:38:41 +0800
Tag:    v3.1.1

MDL-55041 roles: Fix JSON parsing in permission manager


commit 6862093122252570bf6e84cfaf6af071b6a24fa8
Author: Mark Johnson <mark.johnson@open.ac.uk>
Date:   Tue, 31 May 2016 19:34:58 +0800
Tag:    v3.1.1

MDL-54180 Behat: Handle exceptions from driver when saving screenshot