merge master code to build iotivity