Fit for 9.0#9

dkfellows wants to merge 8 commits intotrunkdkfellows/shape:trunkfrom

fit-for-9.0dkfellows/shape:fit-for-9.0Copy head branch name to clipboard