hopefully last of bug fixes...
Merge remote-tracking branch 'origin/master' into WhatDoesTheFoxSay