Merge branch 'sbin'

# Conflicts:
#	test/prefix.bats

test/prefix.bats

@@ -26,6 +26,7 @@ load test_helper
 
 #Arch has Python at sbin as well as bin
 @test "prefix for sbin system" {
+  export PATH="${PYENV_TEST_DIR}/sbin:$PATH"
   mkdir -p "${PYENV_TEST_DIR}/sbin"
   touch "${PYENV_TEST_DIR}/sbin/python"
   chmod +x "${PYENV_TEST_DIR}/sbin/python"