From d20df90e1531a196969403358f7c903ef0b2a31a Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Thu, 2 May 2013 00:39:45 +0200
Subject: [PATCH] Merged cherry-pick

-- 
GitLab