Merge "deal with extra quotes" into jellyfish