2.15 BUILD: Alphabetized class attributes.
Merged master.