static update
Merge remote-tracking branch 'github/static' into static