Adding 'Travel Mode' capability
Merge remote-tracking branch 'origin/master'