Revert "Merge remote-tracking branch 'upstream/master'"

This reverts commit e6590d841d6d64c6b82834153efd72d119948655, reversing
changes made to 561acc7e15414d3f9f7b1cc72cc59acfa714b0f8.
Revert to stable mruby