Merge pull request #9041 from kasper93/master