BUG: Allow empty else- and else_if-blocks

This fix allows empty else and else-if blocks to be processed, fixes #1660
Merge pull request #1750 from s-m/1660-elseif-parsing

BUG: Allow empty else- and else_if-blocks