Fix crash when handling array conversions
Fix compatibility issues with rake db:gis:setup
Raise a more useful exception on Rails4/JRuby
Merge remote-tracking branch 'upstream/master'