Use Kernel const_get instead of String.constantize
Bump ruby version for dev
Fix conflict with upstream/master