Merge pull request #4792 from dagood/remove-core_root-workaround
authorDavis Goodin <dagood@users.noreply.github.com>
Thu, 5 May 2016 14:28:41 +0000 (09:28 -0500)
committerDavis Goodin <dagood@users.noreply.github.com>
Thu, 5 May 2016 14:28:41 +0000 (09:28 -0500)
Remove CORE_ROOT workaround


Trivial merge