Commit 3deb02c1 authored Jun 09, 2020 by Bruno Chatras

Merge branch 'issue#20' into 'dev-v3.3.1'

Issue #20. Back out changes committed in issue#11

See merge request !77