Merge branch feature/testing_accept_45635491

Sprint story: http://www.pivotaltracker.com/story/show/45635491
Main story: None