Merge openchange/master branch

partial