Merge pull request #1278 from mcnewton/updatehelp