Build #883:   Merge 960cee564b68a8bb1081abc3330f67c1df0c7ed0 into 80f04edb3142a1637dca82a63cdc5ba61c8... on branch clustering-zhang over 4 years ago