Merge branch 'bug-1276' into release