Added junk
Riese changes
Allow merge
Merge remote-tracking branch 'origin/master' into Dan