Fix build file.
Merge branch 'master' into develop