Bug 952324 - Don't block native events for more than 50ms [r=jimm]
Bug 878935 followup - touch CLOBBER file to clean up bustage
Merge m-c to inbound.