Merge pull request #46 from mancdaz/grizzly

Merged automatically by jenkins after successful build test
Merge pull request #47 from mancdaz/grizzly

Merged automatically by jenkins after successful build test
Work towards resolving DE238
finish work on DE238
Merge pull request #48 from rackerjoe/DE238

Merged automatically by jenkins after successful build test