Revert "Merge remote-tracking branch 'openchange/master'"

This reverts commit 09382050dc129bab05aa1b91e190bf05498fab6b, reversing
changes made to 461b229fb4efa798ed398e84acb1c16e312d42a0.
Merge branch 'master' into saucy