Merge pull request #6291 from atomicdryad/pr-fixvice