Merge pull request #4072 from briansull/safe-refactor
authorBrian Sullivan <briansul@microsoft.com>
Tue, 5 Apr 2016 02:03:01 +0000 (19:03 -0700)
committerBrian Sullivan <briansul@microsoft.com>
Tue, 5 Apr 2016 02:03:01 +0000 (19:03 -0700)
Safe refactoring changes and code cleanup items


Trivial merge