Develop plus 1.5

This is my shot at merging 1.5-development with develop. Here for @patrickmeehan to use as a reference for his own merge, hopefully with help we get it done cleanly and the unification can be complete :)