Brings this branch up to date with the master commit. It was missed in the previous commit, fixed in master, and this brings 3.x back in sync.

Feel free to rename the commit message :)