Fixes #1338. Drawback: requires a small schema migration (included).
Merge pull request #1400 from capooti/issue-1388

Fixes #1388. Drawback: requires a small schema migration (included).