Merge branch 'master' into author-validations

Conflicts:
	db/schema.rb