Merge pull request #6389 from dumganhar/v2

'master' -> 'v2' for travis-ci