Merge branch 'MDL-25761_data_portfolio' of git://github.com/mudrd8mz/moodle