Now I really want to break things.
Merge remote-tracking branch 'origin/master'

Conflicts:
	DataModel/ProjectSource.cs
Uh, does this work?