Get rid of "mock deprecated" messages
Merge branch 'mock-update' of git://github.com/alcarvalho/ruby2600 into alcarvalho-mock-update