Fix a regression!
Merge branch 'incoming'
[auto] Merge from Core

    • #e40f89b — Fix a regression! (Ivan Enderlin, 2013-07-11)
    • #3f9f5cd — Merge branch 'incoming' (Ivan Enderlin, 2013-07-11)

---

Merge remote branch 'library-core/master'