Merging the most current set
authorHideki Saito <hideki@mio.local.hidekisaito.com>
Mon, 12 Oct 2015 09:26:37 +0000 (02:26 -0700)
committerHideki Saito <hideki@mio.local.hidekisaito.com>
Mon, 12 Oct 2015 09:26:37 +0000 (02:26 -0700)
Merge branch 'master' into next


Trivial merge