Merge branch 'bug-893' into bug-1136