Merge pull request #673 from feckert/bugfix_sleep_sysupgrade