Merge from Julia master; fixes else|elseif indent bug