Merge branch 'bug-1392' into release