Revert "Revert "Revert "Merge branch '6.x-1.x' of github.com:victorquinn/uc_stripe into 6.x-1.x"""

This reverts commit cf634d38b3045aba3f86c8801993984ab9783405.