Merge branch 'hotfix/1.9.5'
specify rake 0.8.7
Merge branch 'master' into develop