From 3013c1ed7a2bf7aed127d2603182ca8d7995833f Mon Sep 17 00:00:00 2001
From: Peter Molnar <hello@petermolnar.eu>
Date: Thu, 7 Nov 2013 20:53:32 +0000
Subject: [PATCH] Merge branches 'master' and 'mcachesock' into mcachesock