Wow, we had elseif(s) ? And they worked? NagaQueen is crazy stuff.
Merge branch 'master' into 97x