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

    • #2cd8c11 — Define flex entities. (Ivan Enderlin, 2013-10-15)
    • #91d52b7 — Better composer compatibility (jubianchi, 2013-10-15)

---

Merge remote branch 'library-stream/master'