New Gem version 1.3.6.
Merge branch 'v1.3.x'