Delete gbcmd.conf
Delete espiDerived.xsd
Merge remote-tracking branch 'upstream/master'