rebase glenn/live-dev branch
Merge pull request #239 from adobe/randy/live-dev-rebase

Rebase glenn/live-dev branch