Merge pull request #3451 from awakecoding/nla_server_fix
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 22 Jul 2016 13:34:49 +0000 (09:34 -0400)
committerGitHub <noreply@github.com>
Fri, 22 Jul 2016 13:34:49 +0000 (09:34 -0400)
NLA Server Side Improvements


Trivial merge