Merge branch 'bug11464_023_squashed' into maint-0.2.3