Merge build changes committed in 'eclipse' branch #3

Closed zcsteele closed 7 years ago