It's really an elif
Merge branch 'master' into dev