Merge branch 'MDL-29763_portfolio_description' of git://github.com/davosmith/moodle