master
Merge branch 'master' into nhanh

Conflicts:
	config/boot.rb