From: adin <adin.riv@gmail.com>
Date: Tue, 7 Apr 2020 17:10:24 +0000 (+0000)
Subject: Merge branch 'nwf' into 'master'
X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=8a77ce4f83ddaefe9cb0c00f284636fb0b08415d;p=mcv-academic

Merge branch 'nwf' into 'master'

Cherry picked contributions by nwf

See merge request adin/mcv-academic!2
---

8a77ce4f83ddaefe9cb0c00f284636fb0b08415d