Merge pull request #3897 from Lakedaemon/namespaceWork
authorWouter van Oortmerssen <wvo@google.com>
Mon, 13 Jun 2016 22:16:28 +0000 (15:16 -0700)
committerGitHub <noreply@github.com>
Mon, 13 Jun 2016 22:16:28 +0000 (15:16 -0700)
Namespace work


Trivial merge