V0.8 patches
This MR is to merge the patches into master. Will probably have to deal with conflicts without affecting the branch. Perphas best to do in another branch?
This MR is to merge the patches into master. Will probably have to deal with conflicts without affecting the branch. Perphas best to do in another branch?