teamprop update
Merge pull request #518 from emollient/master

teamprop update