Sync with Griffon 1.2.0