Fix gem version
Merge remote-tracking branch 'origin/v1.6'