Submitting BugshotKit
Merge pull request #7552 from marcoarment/master

Submitting BugshotKit