merge in 6d7ba52
build file simplification