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

    • #daf1e51 — Define flex entities. (Ivan Enderlin, 2013-10-15)
    • #5e34bf6 — Better Composer compatibility. (Ivan Enderlin, 2013-10-15)

---

Merge remote branch 'library-xml/master'