From e0683681ffa16ce8d0cf9c7b699c4babf342c329 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 26 Jan 2016 18:28:47 +0100
Subject: [PATCH] Merge