Merge commit '0781a30' into rails-4

Conflicts:
	.gitignore