reopen master for 2.5 development (#4571)

3 files changed