Issue #274 - Reopened for Enumerable.Empty<>
Issue #274 - Reopened for Enumerable.Empty<> (Revised)
Merge branch 'mmurrell-develop' into develop