A bunch of shipit's merged

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

@ -1 +1 @@
Subproject commit 7d8dd6e21051cb548c731fc85f76deb980dc66a8
Subproject commit 1de3509f3bd6bb61fc074fe41cc21989e7167457