Merge branch 'admin_whitespace_cleanup_master' of git://github.com/stronk7/moodle