Bug 985739 - [marketplace-tests-gaia] Update the test to search for a paid app so it can be run
Add a step to change the region to US via the :debug screen
Merge pull request #26 from bobsilverberg/search_for_paid_app

Bug 985739 - [marketplace-tests-gaia] Update the test to search for a paid app so it can be run
Bug 993078 - [marketplace-tests-gaia] Add a test to create and confirm a PIN
Merge pull request #27 from bobsilverberg/create_confirm_pin

Bug 993078 - [marketplace-tests-gaia] Add a test to create and confirm a PIN
Xfail tests that rely on 'Test Zippy With Me' being available
Merge pull request #30 from bobsilverberg/xfail-payments

Xfail tests that rely on 'Test Zippy With Me' being available
Bug 997951 - [marketplace-tests-gaia] Clean up and bolster some tests which are failing intermittently

Add compatibility with current gaiatest
Merge pull request #32 from bobsilverberg/current_gaiatest

Bug 997951 - [marketplace-tests-gaia] Clean up and bolster some tests which are failing intermittently
Bug 1006226 - [marketplace-tests-gaia] Address intermittent failure of test_marketplace_feedback_login by improving waits
Bug 1006241 - [marketplace-tests-gaia] Address intermittent failure of test_marketplace_search_and_install_app by cleaning it up
Merge pull request #35 from bobsilverberg/install_failure

Bug 1006241 - [marketplace-tests-gaia] Address intermittent failure of test_marketplace_search_and_install_app by cleaning it up
Merge pull request #34 from bobsilverberg/feedback_failure

Bug 1006226 - [marketplace-tests-gaia] Address intermittent failure of test_marketplace_feedback_login by improving waits
Bug 993114 - [marketplace-tests-gaia] Add a test to purchase an app using Zippy

Conflicts:
	marketplacetests/marketplace/app.py
Bug 1006509 - [marketplace-tests-gaia] Remove code for setting timeouts and use the command line option instead
Merge pull request #36 from bobsilverberg/timeout

Bug 1006509 - [marketplace-tests-gaia] Remove code for setting timeouts and use the command line option instead
Merge pull request #33 from bobsilverberg/purchase

Bug 993114 - [marketplace-tests-gaia] Add a test to purchase an app using Zippy
Bug 1007100 - [marketplace-tests-gaia] Add an extra wait for Marketplace to be fully loaded
Merge pull request #37 from bobsilverberg/extra_wait

Bug 1007100 - [marketplace-tests-gaia] Add an extra wait for Marketplace to be fully loaded
Revert "Bug 1007100 - [marketplace-tests-gaia] Add an extra wait for Marketplace to be fully loaded"

This reverts commit d90b6e63441fb85ed6e94c7b899a61a1e99f9264.