In branch development commit 8d859168 from @tmetz in branch master is reverted due to merge of branch from @wittkamp. I will readd the commit ASAP.
