Define flex entities.
Better Composer compatibility.
[auto] Merge from Xyl

    • #423bb60 — Define flex entities. (Ivan Enderlin, 2013-10-15)
    • #b00c844 — Better Composer compatibility. (Ivan Enderlin, 2013-10-15)

---

Merge remote branch 'library-xyl/master'