Issue 5149a Conflicts: spec/controllers/aspects_controller_spec.rb spec/controllers/contacts_controller_spec.rb
