Changes since tag 2.9.25

commit b813c342ca68b90ad42e8c5c3223cc1b560586f8
Author: Benjamin Staneck <staneck@gmail.com>
Date:   Thu Mar 16 21:06:56 2017 +0100

    cleanup

