Consistently work properly with model: null
Merge branch 'master' of github.com:SitePen/dstore