merge master

4 jobs for byebye_cython in 6 minutes and 19 seconds (queued for 16 seconds)