fix conditiional with undefined props
Merge branch 'master' of github.com:mojo-js/paperclip.js