updated patches for current 2.1 head
Merge pull request #2991 from skaes/ruby-2-1-head-patch-update

updated patches for current 2.1 head