From a167eca0b7683282509781f5d0a7cae346f3792f Mon Sep 17 00:00:00 2001
From: Rik Veenboer <rik.veenboer@gmail.com>
Date: Sat, 29 Nov 2014 18:49:35 +0000
Subject: [PATCH] Move to master branch