Build update fix
Merge branch 'QA-Auto'
more woo
Merge branch 'QA-Auto'
blerg