Initial merge of contributions from Julian Gantner at SoftwareInMotion.