For remerging the pre-release 2.5.1 changes back to master