Merge "Fix double colons in api help output"