MISC: start 0.3.x maintenance branch
MISC: start 0.4.0 development
MRG: -s ours merge of maint version changes

Mark version number changes from maint branch as merged, so we can merge from
maint later without conflicts.