Merge remote-tracking branch 'upstream/master' into 4.0-dwt
Allow live editing the examples
Merge branch 'release-4.0'
Merge remote-tracking branch 'upstream/master' into 4.0-live-edit
Merge pull request #562 from mfairchild365/4.0-live-edit

Redo #559