Merge pull request #6 from fpapon/GERONIMO-6830