am c5adba2e: (-s ours) Reconcile with jb-dev - do not merge
Jean-Baptiste Queru authored
* commit 'c5adba2e':
06cf41b3