Merge with d76ad1ff0672265181abb0788c29512bfdc2b0e2
# content of conftest.pyimportpytestdefpytest_addoption(parser):parser.addoption("--runslow",action="store_true",help="run slow tests")defpytest_runtest_setup(item):if'slow'initem.keywordsandnotitem.config.getvalue("runslow"):pytest.skip("need --runslow option to run")