e02b51a458563154d1bc9e888500331f61f4c8ed
19 commits (simon.hager@ost.ch)
14 commits (ciro.brodmann@ost.ch)