Update bleeding branch to match master

This adds a few changes to the bleeding branch that only the master had.