Fix #518#519

Sellafield merged 2 commits intoOpenPerpetuum:DevelopmentOpenPerpetuum/PerpetuumServer:Developmentfrom

aqpanaciy:aqpanaciy-build-fixaqpanaciy/perpetuum-server:aqpanaciy-build-fixCopy head branch name to clipboard