Merge branch 'morphemic-rc2.5' into ems/morphemic-rc2.5

10 jobs for ems/morphemic-rc2.5 in 17 minutes and 34 seconds (queued for 4 seconds)