Merge "edify: accept long string literal."