Build Ruby 2.1.1
Install Ruby 2.1.2
Merge branch 'master' into 2.1

Conflicts:
	Dockerfile