Merge pull request #930 from cshore-firmware/pull-request-fix-webadmin