Merge branch 'bug-1391'