This includes two upstream fixes: - Handle explicit JSON "null" consistently during decode of JSON syntax. - Properly detect the end of a "heredoc" when formatting to avoid messing up indentation of other lines following the heredoc.