Merge branch 'fix-baggers-pairing' into gh-pages