Merge pull request #1571 from shackbarth/xtuplecon