Support elseif with no else statement after it
Merge branch 'master' of github.com:CopernicaMarketingSoftware/SMART-TPL