Merge pull request #2160 from avsej/wmname-0.1