-
Merge remote-tracking branch 'origin/master'
+ Lazy initialization for assets
Merge remote-tracking branch 'origin/master'