3.297 fixes

Y U NO MERGE RIGHT?
Merge remote-tracking branch 'origin/master' into ed-isnotawebdesigner