pin: don't show None
Merge remote-tracking branch 'upstream/master'
Fixed failing asset models in tests