Merge branches 'master' and 'ruby193-fixes' into ruby193-fixes
Merge branches 'master' and 'ruby193-fixes'