Merging Source v1.7.2: final commit, assuming there are no bugs. Now to work on v0.2.2