confluence Merge pull request #3 from confluence/2to3