Define flex entities.
Better composer compatibility
[auto] Merge from File

    • #78e1058 — Define flex entities. (Ivan Enderlin, 2013-10-15)
    • #dc5b078 — Better composer compatibility (jubianchi, 2013-10-15)

---

Merge remote branch 'library-file/master'