DFD
Merge branch 'loltesting_samsstuff' into LOLTESTING