Merge "change default python 3 env in tox to 3.5"