Merge branch 'dev-2.3'

2.1.x left on v2.1.x branch

diff --cc ruby.spec
index 3520b436ac9c64e862ebca63e423a57ee6b77ee4,8f8ad76b545c9de3e060d593a6c3559846a23bf4..8307176c4fb02cd53a03ea821b9323b2f213ea98
--- 1/ruby.spec
--- 2/ruby.spec
+++ b/ruby.spec
@@@ -11,10 -11,10 +11,10 @@@
  %bcond_with   bootstrap       # build bootstrap version
  %bcond_with   tests           # build without tests
  
- %define               rel             2
- %define               ruby_version    2.1
- %define               basever         2.1
- %define               patchlevel      10
 -%define               rel             0.4
++%define               rel             1
+ %define               ruby_version    2.3
+ %define               basever         2.3
+ %define               patchlevel      4
  %define               pkg_version     %{basever}.%{patchlevel}
  
  %define               ruby_suffix %{!?with_default_ruby:%{ruby_version}}