Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove 'screen' from screen identifier values - see #314
(cherry picked from commit 84f7867)
(cherry picked from commit 84f7867)