Set correct format for answers copy
Merge branch 'origin/7.x-1.x'