This commit applys the diff by @ssrlive from 3223ca4e22 (commitcomment-105521241).
3223ca4e22 (commitcomment-105521241)