Remove superfluous ternary operators
Merge branch 'master' into feature/json-app-settings