Merge branch 'hotfix/2.11.1'

* hotfix/2.11.1:
  * Bumped up version
* Tested against Rails 4.0.9 and 4.1.5
* Bumped up version
Merge branch 'hotfix/2.11.2' into develop

* hotfix/2.11.2:
  * Tested against Rails 4.0.9 and 4.1.5 * Bumped up version