One does not simply merge into master

Another "post merge-fix" gem