Merge branch 'next' master
authorHideki Saito <hideki@hidekisaito.com>
Mon, 12 Oct 2015 09:38:32 +0000 (02:38 -0700)
committerHideki Saito <hideki@hidekisaito.com>
Mon, 12 Oct 2015 09:38:32 +0000 (02:38 -0700)

Trivial merge