Fix hightlighting of types that end with apostrophes in gedit.
Merge branch 'master' into python-32