Merge of latest master
Merge branch 'master' into CDB-3103

Conflicts:
	README.md
	app/models/user.rb
	lib/tasks/db_maintenance.rake
CDB-3103 fixed failing spec
Merge branch 'CDB-3103' into CDB-2891

Conflicts:
	NEWS.md
	lib/tasks/db_maintenance.rake