Trim answer fields to fix #406.
Merge branch 'stable'