Upgrade to 2.11.4 and added travel build
Merge remote-tracking branch 'origin/master'