jugglerchris Merge branch 'smart-autoindent' into update-pegex