Fixes from 1-4-stable and cleanup
Officially drop support for Ruby older than 2.2
Fixes #473 (closed)