Travis hook test
Merge remote-tracking branch 'cc/master'