Trying to deal with issue described http://forums.modx.com/thread/32541/modx-revo-event-output-issue-in-plugin#dis-post-437548 so now modEvent::output() can be used for setting the output, instead of "semi-private" modEvent::_output, which should generally be used only for internal interactions.
Merge remote-tracking branch 'xpdo/develop' into develop

* xpdo/develop:
  [#9629] Fix notice in xPDOConnection::getOption() when $options not an array
  [#9020] Prevent xPDOZip from attempting to add empty targets
Merge remote-tracking branch 'xpdo/develop' into develop

* xpdo/develop:
  Bump version for xPDO 2.2.6-pl release
  [#7452] Fix sql errors with decimal fields in some locales
  [#9062] Fix problem loading multiple xPDOQuery driver classes
Merge remote-tracking branch 'xpdo/develop' into develop
Merge remote-tracking branch 'xpdo/develop' into develop
Merge remote-tracking branch 'xpdo/develop' into develop

* xpdo/develop:
  Various documentation corrections
  Fix xPDOIterator->next() using void return value
  Fix undefined constant object in xPDO->toCache()
  Fix xPDO::prepare() sending no driver_options
  Fix xPDO::getInstance() when reusing existing
  Fix invalid call to $this->xpdo->log()
  [#9864] Identify compound PK's properly in xPDOQuery::parseConditions()
  Bump version for 2.2.8-dev
  Update getPK() to look for Schema Version 1.1 indexes first
  Check ob_get_level() at ob_end_* calls where ob wasn't explicitly started
Merge remote-tracking branch 'xpdo/develop' into develop

* xpdo/develop:
  Bump version for 2.2.8-pl release
Merge remote-tracking branch 'xpdo/develop' into develop

* xpdo/develop:
  Fix xPDOTest::getTableMeta() error (sqlite/sqlsrv)
  Bump version for 2.2.9-dev
  Wrong query statistic counting
  [#10183] Fix cache entry removal on xPDOObject::remove()
xPDO 2.2.9-pl

Merge remote-tracking branch 'xpdo/develop' into develop

* xpdo/develop:
  Bump version for 2.2.9-pl release
Fixed bugs and updated language file

* Added Country file;
* Updated PT-PT Country file;
* Updated lexicon entries;
* Updated variable type errors.
Update setting.inc.php

aggiornamento per 2.2.10
Update file.inc.php

per modx 2.2.10
italian lexicon for modx 2.2.10
Update update.class.php

Removed setting $this->classKey to avoid error when trying to change the class_key of a user. The inheritance to modUser of a custom user class will make it load modUser record anyway
Minor bug fixes
Update code docs, fix invalid constant
Disable phpdoc generation in build for now
Update Brazilian Portuguese lexicon topics

Merge remote-tracking branch 'origin/pr/613' into release-2.2

* origin/pr/613:
  Minor bug fixes
  Fixed bugs and updated language file
Update Italian lexicon topics

Merge remote-tracking branch 'origin/pr/614' into release-2.2

* origin/pr/614:
  italian lexicon for modx 2.2.10
  Update file.inc.php
  Update setting.inc.php
Update Dutch lexicon topics

Merge remote-tracking branch 'origin/pr/617' into release-2.2

* origin/pr/617:
  Updated Dutch lexicons for 2.2.10