Merge branch 'bug1384'