Final merge of the pre-release changes of 2.5.1 back to master