Git commits in Moodle 3.1.2 by gthomas2

commit 1df4dfe56038dc13fecc59f392919428d0a9af1c
Author: gthomas2 <gthomas@moodlerooms.com>
Date:   Wed, 24 Aug 2016 00:40:03 +0800
Tag:    v3.1.2

MDL-55312 requirejs: Fix timeouts with infinite waitSeconds