Merge remote-tracking branch 'origin/master' into stable
Merge remote-tracking branch 'origin/master' into stable
new manifest format
Merge remote-tracking branch 'origin/master' into stable
Merge remote-tracking branch 'origin/stable' into stable