Merge branch 'BGv1_Norris'
Merge branch 'BGv1_Norris'
Merge branch 'BGv1_Norris'
UPDATE!
CONFLICTS SOLVE
Merge branch 'master' into BGv1_Norris