Merge pull request #711 from geany/elextr-patch-1