Better composer compatibility
Define flex entities.
Merge branch 'pr/3' into incoming
[auto] Merge from Bench

    • #b01950b — Better composer compatibility (jubianchi, 2013-08-25)
    • #464d05d — Define flex entities. (Ivan Enderlin, 2013-10-15)
    • #7ccd428 — Merge branch 'pr/3' into incoming (Ivan Enderlin, 2013-10-15)

---

Merge remote branch 'library-bench/master'