Merge pull request #1 from openchange/master

Sync with master