Merge branch 'dementeddevil-master'
multiple changes
busy busy