Merged in the new master to solve conflicts