merge travis branch
merge travis branch

TSavo/XChange,nopy/XChange,timmolter/XChange,evdubs/XChange,npomfret/XChange,LeonidShamis/XChange,douggie/XChange,stachon/XChange,Panchen/XChange,chrisrico/XChange,andre77/XChange,ww3456/XChange