Recent property changes
Merge branch 'master' of https://github.com/emodels/mypropertylk