From e210ce85588af22f4408f54776c313b8130f8dc8 Mon Sep 17 00:00:00 2001
From: "Jip J. Dekker" <admin@recondor.com>
Date: Sun, 30 Mar 2014 22:08:21 +0200
Subject: [PATCH] Merge branch 'develop', remote-tracking branch
 'origin/develop' into develop