Replaced default Dummy files with slightly less dumb files.
Merge remote-tracking branch 'origin/master'