Updated master for 1.5 development