shell source
Merge remote-tracking branch 'origin/develop' into feature/travis
hash out of sync?