85a2fb07c2
Merge commit '145c989cafe72d99af120044fed256ac2f982568' * commit '145c989cafe72d99af120044fed256ac2f982568': Fix a hang during bootup.