Finish Release-12

Conflicts:
	Gemfile (reverted from commit 11ffca1820065f965104ba9cecc2156acfbcf013)