this wasn't there?
Merge branch 'master' into forums

Conflicts:
	db/schema.rb