Merge remote-tracking branch 'shared/master'
authormh <mh@immerda.ch>
Sun, 27 Mar 2016 16:34:18 +0000 (18:34 +0200)
committermh <mh@immerda.ch>
Sun, 27 Mar 2016 16:34:18 +0000 (18:34 +0200)

Trivial merge