Merge branch 'hotfix/1.18.13' into stable
1.18.14
ruby 2.0.0 requires bundler 1.3+, fix #1587
ruby 2.0.0 requires bundler 1.3+, fix #1587
Merge branch 'hotfix/1.18.14'