Merge commit '83f86de3de60ea24462a0e04a09ddb4a435966c9' * commit '83f86de3de60ea24462a0e04a09ddb4a435966c9': Fix broken build.