commit c1956c57c0b6ae0fc52e05ddc5004e96ae7b3246
Author: Stefan Junker <mail@stefanjunker.de>
Date:   Wed Jul 29 16:07:51 2015 +0200

    Prepare master branch