Changes since tag 3.3.6

commit 54f096507779f5975bcfed9ea0b47e6937693ac6
Author: Benjamin Staneck <staneck@gmail.com>
Date:   Thu Mar 16 20:15:44 2017 +0100

    format fix

