Merged from SVN (sf.net/p/gxkb)