Update v6.4.0-dev#493

StuartWheater merged 14 commits into

datashield:v6.4.0-devdatashield/dsBase:v6.4.0-devfrom

StuartWheater:v6.4.0-devStuartWheater/dsBase:v6.4.0-devCopy head branch name to clipboard