rebuild assets
Merge remote-tracking branch 'origin/1.3' into 1.3