Merge branch 'MDL-24898_strip_and_trunc_subjects_wip' of git://github.com/stronk7...