Merge branch 'master' into lruhash
authorshodoco <shodoco@gmail.com>
Fri, 2 Dec 2016 03:35:19 +0000 (19:35 -0800)
committerGitHub <noreply@github.com>
Fri, 2 Dec 2016 03:35:19 +0000 (19:35 -0800)

Trivial merge