Guenter Obiltschnig d90a3da585 merge fixes from develop 8 years ago
..
Poco d90a3da585 merge fixes from develop 8 years ago