Merging in master; 3 conflicts.