diff --git a/HISTORY.txt b/HISTORY.txt
index f544ed5..e36d79e 100644
--- a/HISTORY.txt
+++ b/HISTORY.txt
@@ -1,10 +1,17 @@
-Unreleased
+1.2.10 (unreleased)
+
+- Use the same alias for Python in both 4.x and 5.x, python2.7.
+  This only matters for tests.
+  [smcmahon]
+
+- The way we use become_user is problematic for Ansible 2.1 unless pipelining is in use.
+  Set pipelining on in defaults.
+  [smcmahon]
 
 - Symbolic link to self for testing fouled up vagrant on platforms without client extensions.
   Change strategy to use ansible.cfg specification for roles.
   [smcmahon]
 
-
 1.2.9 2016-07-08
 
 - Update to use Plone 5.0.5 as default.
diff --git a/tasks/main.yml b/tasks/main.yml
index 15af298..47005b6 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -63,7 +63,7 @@
     mode=0755
 
 - name: Python virtualenv
-  command: "{{ virtualenv_path | default() }}virtualenv --python={{ plone_python_path }} {{ instance_config.plone_target_path }}/Python-{{ plone_python_version }} \
+  command: "{{ virtualenv_path | default() }}virtualenv --python={{ plone_python_path }} {{ instance_config.plone_target_path }}/python{{ plone_python_version }} \
     creates={{ instance_config.plone_target_path }}/Python-{{ plone_python_version }}"
   when: instance_config.plone_version < '5.0'
 
@@ -218,7 +218,7 @@
 
 # Plone < 5.0; use bootstrap
 - name: Bootstrap buildout
-  command: ../Python-{{ plone_python_version }}/bin/python bootstrap.py --setuptools-version=8.0.4
+  command: ../Python-{{ plone_python_version }}/bin/python{{ plone_python_version }} bootstrap.py --setuptools-version=8.0.4
     creates={{ plone_instance_home }}/bin/buildout
     chdir={{ plone_instance_home }}
   when: instance_config.plone_version < '5.0' and buildout_status.stat.exists == False