Merge remote-tracking branch 'upstream/develop' into patch-bio
authorWim Vanderbauwhede <Wim.Vanderbauwhede@mail.be>
Sat, 28 Apr 2018 10:59:01 +0000 (11:59 +0100)
committerWim Vanderbauwhede <Wim.Vanderbauwhede@mail.be>
Sat, 28 Apr 2018 10:59:01 +0000 (11:59 +0100)

Trivial merge