Thomas's Syncing changes.
Caught up with master, resolved conflicts.