Revert change of parent from master-merge
Revert change of parent from master-merge

cobratbq/jitsi,jitsi/jitsi,jitsi/jitsi,cobratbq/jitsi,damencho/jitsi,jitsi/jitsi,cobratbq/jitsi,damencho/jitsi,jitsi/jitsi,cobratbq/jitsi,damencho/jitsi,damencho/jitsi,jitsi/jitsi,damencho/jitsi,cobratbq/jitsi