Update CONTRIBUTING.md

update bug reporting suggestions a bit
Merge remote-tracking branch 'upstream/devel' into devel