From c1956c57c0b6ae0fc52e05ddc5004e96ae7b3246 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Wed, 29 Jul 2015 16:07:51 +0200
Subject: [PATCH] Prepare master branch