Sync with Griffon 1.3.0