Merge branch 'release/1.3.0'
Fix travis rspec test (use bundler)
Merge branch 'travis-fix' into develop