Merge & fix conflicts- 2.5 stuff into master