Merge remote-tracking branch 'origin/stable'
Updating Assets for Launch
Merge remote-tracking branch 'origin/master' into stable