Merge remote-tracking branch 'origin/CRAFTERCMS-555'
Merge remote-tracking branch 'upstream/master'
CRAFTERCMS-807
Issue caused by solr throwing error when not able to parse attachment. Made workaround to add additional fields only.
Merge pull request #17 from dejan-brkic/master

CRAFTERCMS-807