Epoch is now open source.
Merge remote branch 'origin/jag/internal-nicknack' into jag/internal-nicknack