Includes the changes from 897fddba3e.
Those changes were introduced while resolving a merge
conflict from release back into master.
Includes the changes from 897fddba3e.
Those changes were introduced while resolving a merge
conflict from release back into master.