1.7 Merge

Well, instead of developing in a branch and keeping the legacy in master, it looks like it might be easier to branch legacy and dev in master. So here we go .......