https://github.com/systemed/iD/pull/805

Redo for my previous Pull Request #805.
https://github.com/systemed/iD/pull/805