Merge "Switch to new distribution plugin." into idea133
 Auto-merge: 83be8b6

* commit '83be8b6b0d1d2a2055e0fb8ca6f5ee6a45317cb9':
  Switch to new distribution plugin.