Merge "Don't require 'commit' attribute in merge event"