[fix] elseif/elsif
Merge branch '2014-12-10-fixes'