Merge branch 'devel'

* devel:
  Use virtualenv activate for setting path
  Updated Python version

osx_utils.sh

@@ -12,7 +12,7 @@ GET_PIP_URL=https://bootstrap.pypa.io/get-pip.py
 DOWNLOADS_SDIR=downloads
 WORKING_SDIR=working
 
-# As of 2 June 2017 - latest Python of each version with binary download
+# As of 1 August 2017 - latest Python of each version with binary download
 # available.
 LATEST_2p7=2.7.13
 LATEST_2p6=2.6.6
@@ -20,7 +20,7 @@ LATEST_3p2=3.2.5
 LATEST_3p3=3.3.5
 LATEST_3p4=3.4.4
 LATEST_3p5=3.5.3
-LATEST_3p6=3.6.1
+LATEST_3p6=3.6.2
 
 
 function check_python {
@@ -260,6 +260,7 @@ function remove_travis_ve_pip {
 }
 
 function set_py_vars {
+    # Used by terryfy project; left here for back-compatibility
     export PATH="`dirname $PYTHON_EXE`:$PATH"
     export PYTHON_EXE PIP_CMD
 }
@@ -286,8 +287,11 @@ function get_macpython_environment {
     if [ -n "$venv_dir" ]; then
         install_virtualenv
         make_workon_venv $venv_dir
+        source $venv_dir/bin/activate
+    else
+        export PATH="`dirname $PYTHON_EXE`:$PATH"
     fi
-    set_py_vars
+    export PYTHON_EXE PIP_CMD
 }
 
 function repair_wheelhouse {