Merge branch 'master' into Geoffs_WIP
Finished Descriptions, other small tweaks

boo-shakalah
Merge branch 'Geoffs_WIP'