Merge branch 'hotfix/6.0.5'

* hotfix/6.0.5:
  * Fixed version number
* Fixed Rails version number
Merge branch 'hotfix/6.0.6' into develop

* hotfix/6.0.6:
  * Fixed Rails version number