Merge branch 'bug/bug_fix_7_49592629'

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