Merging release-1.2 branch onto master.

We are starting a merge from release-1.2 branch to master, in order to release a new updated DataMapper version in the near future.