From: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 13 Dec 2016 10:41:35 +0000 (+0100)
Subject: Merge branch 'MDL-55720' of https://github.com/ak4t0sh/moodle
X-Git-Tag: v3.3.0-beta~658
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=bd31523a308b843fc7f73047cbcf278b0164797c

Merge branch 'MDL-55720' of https://github.com/ak4t0sh/moodle
---

bd31523a308b843fc7f73047cbcf278b0164797c