Don't ignore JRuby failures in Travis any longer, since all known ones have been addressed.
Auto-merge remote-tracking branch 'upstream/master'