paradise for 2.11.0-RC1
Merge pull request #308 from xeno-by/master

paradise for 2.11.0-RC1