Split user errors and internal errors for analytics
Merge pull request #5151 from danmcp/master

Split user errors and internal errors for analytics