Add support for multiline {-...-} comments
Merge commit '4f2838f'