Built from 048478b on branch master