Move upgrade step for issue #303 to version 6.