Pulled in and merged upstream.

This commit is contained in:
Rustom Jehangir 2016-01-08 21:18:45 -08:00
parent ee4a714a19
commit f26e741c6f

@ -1 +1 @@
Subproject commit 006d23ccca1375a973b7fae0cc351cedb41b812a
Subproject commit cd525ae85d4a46ecb2e3bdbdd1df101e48c5195e