Merge branch 'release-1.2'

Conflicts:
	lib/dm-core/associations/many_to_one.rb