Merge pull request #5830 from nupplaphil/update_from_boot