Git commits in Moodle x.x.x by Tim Gus

commit bc6e8366a9e96bca6ad8b5a54b8ba32f42ac1e1f
Author: Tim Gus <tgus@remote-learner.net>
Date:   Sat, 07 Jan 2012 02:57:47 +0800
Tag:    v1.9.17

MDL-31055 backport disabledIf fix from 2.0. (MDL-27045)