Master is now ready for bug fixes to be included in 2.5.1.Final. We're not accepting anything beyond bug fixes into master until 2.5.1.Final is released! After that we'll get started on 3.0.0.CR1.