odd behavior from netcore, test files
Merge branch 'master' into tim_dev
Merge branch 'tim_dev'