Integrated the lastest change from https://code.google.com/p/open-zwave