Tue, 06 Aug 2013 12:28:37 +0200 Alpar Juttner Merge further fixes #470