Git merges in Moodle 2.7.17 by Dan Poltawski

commit 8f4e115c4ff162a1e955f160b3ca77751737169a
Author: Dan Poltawski <dan@moodle.com>
Date:   Thu, 10 Nov 2016 21:46:52 +0800
Tag:    v2.7.17

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