Merge branch 'jm/relnotes-2.15-typofix' into maint