Gems merge to master