Manually merge commit '96ace71'

* commit '96ace71':
  kernel.config: aslr test exception in std:stoll