Don't go into an infinte loop if the braces aren't matched.  (Either because of a syntax error, or because our parser is to simplistic.)
Merge 'boostorg/develop' into develop