Doctest fixes
Merge branch 'rizar' of github.com:bartvm/blocks into rizar
Stop using self.__dict__.update(locals()) in order to prevent custom property setters from being called
Forgot parameter in docstring
Merge branch 'rizar' of github.com:bartvm/blocks into bartrizar