Prep master for 1.5.0 merge