Merge branch 'mb/relnotes-2.1'