Merge branch 'release/0.13.6'
fix
Merge branch 'hotfix/gemspec' into develop