Build from commit e224a0b on branch master