Merge 'develop' into 'master'

Once this is done `Dockerfile` will need to be updated to checkout __master__ and not __develop__. Something we need to be careful of (that we don't overwrite the value).