Pull changes into the feature cleanup branch. 

I messed up and the changes that went into master should have went into this branch. Hopefully this will get us back on track.