should this have been false this whole time? :-/
Merge branch 'master' into st3