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