Reconfigured to fix build process for new branch.
Merge remote-tracking branch 'origin' into kd0oss