Merge "Update Ember's name and email"