Merge pull request #462 from jplitza/jsonc-sink