Merge branch 'hotfix/2.11.2'

* hotfix/2.11.2:
  * Tested against Rails 4.0.9 and 4.1.5 * Bumped up version
* Fixed rake task
Merge branch 'hotfix/2.11.3' into develop

* hotfix/2.11.3:
  * Fixed rake task