fixed travis build
Merge remote-tracking branch 'origin/az_upstream'