fixed the linux builder
Merge branch 'develop' into release