Merge branch 'w05_MDL-26182_20_nginx' of git://github.com/skodak/moodle