Merge "Add two useful character constants." into lmp-dev