Tue, 20 Dec 2011 19:37:25 +0100 Alpar Juttner Merge #432 and #433 to branch 1.1 1.1