Doctests on Python 3, trying to make tests pass again
Merge branch 'rizar' of github.com:bartvm/blocks into rizar