Merge branch 'feature/mark_test2_49604395'

Main story: http://www.pivotaltracker.com/story/show/49604395