Merge branch 'w24_MDL-33553_m23_portfoliostrict' of git://github.com/skodak/moodle