Update build file
Merge commit 'a483a0c'