update to 4.1.2.rc1
Merge branch 'master' into vuejs

Conflicts:
	Gemfile
	Gemfile.lock