Merge branch 'bug-932'