Git merges in Moodle 2.9.9 by Dan Poltawski

commit bc9fc77b391f44608d5f3790981cd856adce6ea3
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 10 Nov 2016 21:46:49 +0800
Tag:    v2.9.9

Merge branch 'MDL-55777-29' of git://github.com/ankitagarwal/moodle into MOODLE_29_STABLE