Merge branch 'quote-braces'

This merges #1637 with an
added regression test and a new commit message ready for the next
merging rebase (where the faulty commit will be amended).

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho