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

This reverts commit 56c680a0a201edc5b5d66282db47a6945f442ddd.
Merge branch 'master' into saucy