Merge branch 'hotfix/v0.2.7.2'
mongoid session
Merge branch 'hotfix/v0.2.7.3' into develop