merge (Martin Kepplinger)

Following