Merge branch 'master', remote branch 'origin'
Merge branch 'master', remote branch 'origin'
Merge branch 'master', remote branch 'origin'
fix two typo spotted by pyflakes
couple of typo spotted by pyflakes
Fix plenty of typo spotted by pyflakes
Merge remote branch 'origin/master'
fix setup if cython is not at all present ...
clean up