Merge openchange/master branch

you are like spell checker man :)
Thanks!