Get Ruby Branch up to date

/cc @shufgy 

This should solve the issue with the ruby branch not building.

![ ](http://gifs.joelglovier.com/upset/DataBSOD.gif)