Manually merged pull request by Bram1337