Added changes that were lost after failed merge...

This is why we have switched to permission-based committing via Forking
repos. People committing to the master branch messes everything up.