Changes from the other night. Trying to fix crashes.
Merge branch 'master' into fridayNight
bundled lots of D3 pages.