ba4ac02cfef19211415e98b4ddea057f47c3f682
11 commits (joeran.frey@ost.ch)
8 commits (nyfelix@gmail.com)