Merge branch 'master' into master

pending
(Bruce Becker) #1

Merge branch ‘master’ into master

From a1f5676ded6b53a6ed903329563a95f970599d5b Mon Sep 17 00:00:00 2001
From: Bruce Becker <bruce.becker@egi.eu>
Date: Thu, 6 Dec 2018 20:55:49 +0100
Subject: [PATCH] Merge branch 'master' into master

GitHub