Fixed conflicts from last master merge