Merge branch 'master' into master
authorshodoco <shodoco@gmail.com>
Mon, 19 Dec 2016 19:04:56 +0000 (11:04 -0800)
committerGitHub <noreply@github.com>
Mon, 19 Dec 2016 19:04:56 +0000 (11:04 -0800)

Trivial merge