WPiso + update CDateTime
Merge remote-tracking branch 'origin/chicao'