Merge branch 'bug-602' into release