merge 3.2.x branch back into master

[hayes]

Hey, we are in a bit of an awkward spot where we have been building some of our projects off of the 3.2.x branch that has the large change for generating output without typescript namespaces.

Right now, we are running into issues that have been fixed on that branch (ts namespaces and #145) as well as issues that have been fixed on master (#149).

As more changes make it into master, it will become harder to reconcile these changes because of the large number of files touched. My team is wondering what our best path forward is. We are somewhat blocked on getting this resolved, and would be happy to help if we can, but also would appreciate a rough timeline so we can decide if we should maintain a temporary for until this is merged, or find an alternative if this change is unlikely to land

[hayes]

taking a stab at updating that branch... the number of conflicts is insane, so it may take a bit