Merge "Aesthetic changes in art::mirror::Object and art::mirror::Class."