Merging master into identity to get the two back together again so I can keep working. #25

Closed jhachtel closed 5 years ago