This closes #321
authorJean-Baptiste Onofré <jbonofre@apache.org>
Thu, 22 Nov 2018 13:41:08 +0000 (14:41 +0100)
committerJean-Baptiste Onofré <jbonofre@apache.org>
Thu, 22 Nov 2018 13:41:08 +0000 (14:41 +0100)

Trivial merge