A bunch of shipit's merged

This commit is contained in:
Toshio Kuratomi
2015-11-11 12:19:34 -08:00
parent 8aa2cbd647
commit 7807e99bca