Merge branch 'ci-with-py36' into 'master'

CI with py36, try to fix Apple CI

See merge request !37