Merge branch 'wip-MDL-37009-master' of git://github.com/marinaglancy/moodle

diff --cc course/lib.php
Simple merge

diff --cc lang/en/moodle.php
Simple merge

diff --cc lib/datalib.php
Simple merge

diff --cc lib/moodlelib.php
Simple merge

diff --cc theme/afterburner/style/afterburner_styles.css
Simple merge

diff --cc theme/base/style/core.css
Simple merge

diff --cc theme/magazine/style/core.css
Simple merge

diff --cc theme/splash/style/core.css
Simple merge

diff --cc theme/upgrade.txt
Simple merge