More useful error information.
Merge branch 'master' into horde_activesync_3_0