Further navigational hygiene. "Smoove!"
Merge branch '3.3.1-dev'