Fixing undectected conflicts from the last merge from master on
september 9th.