Merge branch 'MDL-29012-show_deleted_field' of git://github.com/tmuras/moodle