Merge tag '0.3.5'

Release 0.3.5
Stubs next version
Release 0.3.6
Merge tag '0.3.6' into cdb

Release 0.3.6