Some fix and performance updates.
[auto] Merge from Xyl

    • #6573612 — Some fix and performance updates. (Ivan Enderlin, 2013-05-06)

---

Merge remote branch 'library-xyl/master'