Update civicrm_gem
Merge branch 'master' into staging