up patch
Merge branch 'master' into ruby2.0.0