Merge pull request #2127 from commodo/ola-fix-build