Merged in pulled commits