Fixed a small bug from the merge
Fixed a small bug from the merge

jspath/easyXDM,oyvindkinsey/easyXDM,lanson647/easyXDM,jmptrader/easyXDM,oyvindkinsey/easyXDM,aaron-goshine/easyXDM,chazen/easyXDM,chazen/easyXDM,jmptrader/easyXDM,cake-disposal-squad/easyXDM,jmptrader/easyXDM,lanson647/easyXDM,cake-disposal-squad/easyXDM,lanson647/easyXDM,aaron-goshine/easyXDM,chazen/easyXDM,oyvindkinsey/easyXDM,oyvindkinsey/easyXDM,oyvindkinsey/easyXDM,jspath/easyXDM,cake-disposal-squad/easyXDM,aaron-goshine/easyXDM,jspath/easyXDM