denisarnaud pushed to rmol (master). "Upstream update"