Merge branch 'master' of git://git.erlware.org/erlware-mode