Merged in latest from Protobuild updates.