Merge branch 'maint' into release-smart-util-0.1-maint