Merge branch 'MDL-29264_zindex' of git://github.com/andyjdavis/moodle