fixed conditional update
Merge branch 'master' into spaceape-build