Update ruby to 2.1.4 to see if it fixes travis.
Merge remote-tracking branch 'upstream/develop' into develop
fix pull request: delete instead of comment out dead code