Changed string wrapping from [[ ... ]] to [=[ ... ]=] for better conflict handling. A little bit slower, but not in any meaningful way.
Merge remote-tracking branch 'origin/master'