Merge pull request #1104 from nmenon/dtb_build-v2