Initial changes based on discussion with Benoît.
Merge remote-tracking branch 'upstream/master'