Updated for upstream Gaufrette compatibility
Merge branch 'gaufrette-update'