Merge branch 'python3'
Merge branch 'find_executable'