build.sh: correct accidental switch-around
Merge branch 'develop' into hhu