Merge remote-tracking branch 'upstream/master' into rails4-working

Conflicts:
	.travis.yml
	deface.gemspec