Fixes for ZEN-10088 - Exchange 2010 / 2013 support
Merge remote branch 'upstream/develop' into develop
Merge pull request #31 from ssamartyn/develop

Fixes for ZEN-10088 - Exchange 2010 / 2013 support