From 34b5f9a7318c0c6ea6b683e2d9f1d026b5670743 Mon Sep 17 00:00:00 2001
From: lecorguille <lecorguille@users.noreply.github.com>
Date: Fri, 7 Apr 2017 13:15:02 +0200
Subject: [PATCH] Merge branch 'dev', remote branch 'origin'