Git merges in Moodle 2.6.7 by Dan Poltawski

commit b6e289615f7e137606bfb24a4ce9d6cb0a68b45d
Author: Dan Poltawski <dan@moodle.com>
Date:   Tue, 18 Nov 2014 19:52:09 +0800
Tag:    v2.6.7

Merge branch 'MDL-48042_26' of git://github.com/ppichet/moodle into MOODLE_26_STABLE