Added build id as environment variable
Merge remote-tracking branch 'origin/master'