From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Tue, 15 May 2018 13:19:03 +0000 (+0100)
Subject: Merge branch 'master' into testing
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=ad47f203bc4d17d97965188bebad94c32b72a5e9;p=nb.git

Merge branch 'master' into testing
---

ad47f203bc4d17d97965188bebad94c32b72a5e9