Merge pull request #4 from fpapon/GERONIMO-6774