Pulled 5acdfaf; Fixed merge conflicts