* commit '1ca26262':
  ZP-1386 Update mimedecode include. Released under the Affero GNU General Public License (AGPL) version 3.

* commit 'ed406f1e':
  ZP-1391 Support disabling multiple IMAP auth methods, log the disabled methods. Released under the Affero GNU General Public License (AGPL) version 3.
  ZP-1391 Allow disabling the GSSAPI authenticator. Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #690 in ZP/z-push from bugfix/ZP-1400-picture-not-saved-for-a-contact-created-on-mobile to develop

* commit 'c830684e':
  ZP-1400 Picture not saved for a contact created on mobile.

Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #684 in ZP/z-push from bugfix/ZP-1369-impersonation-replyback-notification-mail-can-not-get-folder-name to develop

* commit 'c2a8a35e':
  ZP-1369 Get foldername from MAPI when impersonating.

Released under the Affero GNU General Public License (AGPL) version 3.

ZP-1386 Update mimedecode include. Released under the Affero GNU General Public License (AGPL) version 3.

ZP-1391 Support disabling multiple IMAP auth methods, log the disabled methods. Released under the Affero GNU General Public License (AGPL) version 3.

Merge branch 'bugfix/ZP-1391-imap-disable-gssapi' of https://stash.z-hub.io/scm/zp/z-push into bugfix/ZP-1391-imap-disable-gssapi

ZP-1391 Allow disabling the GSSAPI authenticator. Released under the Affero GNU General Public License (AGPL) version 3.

The php-imap module does not support proper fallback from GSSAPI to
other authentication methods (such as PLAIN). This causes the IMAP
backend to be non-functional when connecting to a GSSAPI-enabled IMAP
server (users will be unable to log in).
Since there is no fix available for the php-imap bug, this change
introduces a IMAP_DISABLE_AUTHENTICATOR setting that can be used to
manually disable GSSAPI support in the imap module.

Cf.: https://github.com/barbushin/php-imap/issues/19

Merge pull request #678 in ZP/z-push from bugfix/ZP-1392-default-backend-warning-about-non-existing-userinformation to develop

* commit '53ebb0f6':
  ZP-1392 Fix SyncUserInformation for default backend. Released under the Affero GNU General Public License (AGPL) version 3.

ZP-1392 Fix SyncUserInformation for default backend. Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #669 in ZP/z-push from bugfix/ZP-1377-undefined-index-warnings-in-imap-backend to develop

* commit '69c08ccd':
  ZP-1377 Fix undefined index warnings in imap backend.

Merge pull request #674 in ZP/z-push from bugfix/ZP-1383-carddav-last-character-of-note-trimmed to develop

* commit '5be4d255':
  ZP-1383 Fix carddav last character of note trimmed. Released under the Affero GNU General Public License (AGPL) version 3.

ZP-1383 Fix carddav last character of note trimmed. Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #673 in ZP/z-push from feature/ZP-1382-caldav-out-of-office-tentative-workingelsewhere-status to develop

* commit '8608d3f9':
  ZP-1382 Caldav outofoffice tentative workingelsewhere status. Released under the Affero GNU General Public License (AGPL) version 3.

ZP-1382 Caldav outofoffice tentative workingelsewhere status. Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #672 in ZP/z-push from bugfix/ZP-1379-undefined-offset-warnings-when-impersonating to develop

* commit '594690a2':
  ZP-1379 Undefined offset warnings when impersonating.

Merge pull request #670 in ZP/z-push from bugfix/ZP-1376-out-of-memory-check-when-memory_limit-1 to develop

* commit 'd08421f2':
  ZP-1376 Return false in IsRequestMemoryLimitReached if memory_limit set to -1.

Merge pull request #666 in ZP/z-push from bugfix/ZP-1375-z-push-config-nginx-has-wrong-permissions to develop

* commit '5e4cde0d':
  ZP-1375 Change state and log dirs and log rotation ownership to root:z-push on RHEL based operating systems.

Merge pull request #668 in ZP/z-push from bugfix/ZP-1374-include-path-in-imap-backend-lacks-pear-folders to develop

* commit 'c1000d1c':
  ZP-1374 Add imap backend location to the include_path when using imap backend.

Merge pull request #667 in ZP/z-push from bugfix/ZP-1373-use_custom_remote_ip_header-not-working-with-apache to develop

* commit '3dfa3443':
  ZP-1373 Modify custom header so it matches the apache modphp version.
  ZP-1373 Disable custom remote IP header by default.

Merge pull request #671 in ZP/z-push from bugfix/ZP-1291-cli-tools-should-exit-with-0-if-called-with-help to develop

* commit '0ca4275a':
  ZP-1291 Exit with 0 if gab2contacts called with help.
  ZP-1291 Exit with 0 if gab-sync called with help.
  ZP-1291 Exit with 0 if z-push-top called with help.
  ZP-1291 Exit with 0 if z-push-admin called with help.

Released under the Affero GNU General Public License (AGPL) version 3.

Released under the Affero GNU General Public License (AGPL) version 3.

Released under the Affero GNU General Public License (AGPL) version 3.

Released under the Affero GNU General Public License (AGPL) version 3.

Released under the Affero GNU General Public License (AGPL) version 3.

to -1.

Released under the Affero GNU General Public License (AGPL) version 3.

Released under the Affero GNU General Public License (AGPL) version 3.

backend.

Released under the Affero GNU General Public License (AGPL) version 3.

Released under the Affero GNU General Public License (AGPL) version 3.

Released under the Affero GNU General Public License (AGPL) version 3.

root:z-push on RHEL based operating systems.

Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #664 in ZP/z-push from bugfix/ZP-1339-replace-removed-php-mapi-functions to develop

* commit '3d47a722':
  ZP-1339 Replace removed PHP-MAPI functions.

Released under the Affero GNU General Public License (AGPL) version 3.

Merge pull request #661 in ZP/z-push from bugfix/ZP-1370-impersonation-public-folder-can-t-be-opened to develop

* commit 'c17e1bdf':
  ZP-1370 Recognize Public root as root folder.
  ZP-1370 isZPushEnabled flag always needs to be checked on the main store.
  ZP-1370 PR_IPM_SUBTREE_ENTRYID doesn't work on the public folder.

Released under the Affero GNU General Public License (AGPL) version 3.

store.

Released under the Affero GNU General Public License (AGPL) version 3.

Released under the Affero GNU General Public License (AGPL) version 3.