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
Check ob_get_level() at ob_end_* calls where ob wasn't explicitly started
Update getPK() to look for Schema Version 1.1 indexes first
[#6937] Fix Persistent/Reflected XSS in User Messaging

(cherry picked from commit 74a9f75b8857d4dbe98f38617c359ee8202c9eff)
[#10043] Fix class-loading LFI in registerLogging

(cherry picked from commit a04d19325ab3dfd8fdc4242f64c2e10cc14d0034)
Bump version for 2.2.8-dev
[#9864] Identify compound PK's properly in xPDOQuery::parseConditions()

Add an additional check to make sure the value is a scalar
Fix invalid call to $this->xpdo->log()

in xPDO->getCriteriaType()
Fix xPDO::getInstance() when reusing existing

if getting an existing instance without indicating an $id, calling key(self::$instances) would fail because you cannot pass self::$instances by reference since it is not a variable
Fix xPDO::prepare() sending no driver_options
Fix undefined constant object in xPDO->toCache()
Fix xPDOIterator->next() using void return value
Various documentation corrections
Merge remote-tracking branch 'Flygenring/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
Bump version for 2.2.8-pl release