Merge "Escape single quotes in arguments." into lmp-dev