Upstream fixes:
82dd97c4b73ace6067fbe3fa92a3c7eb5a95e89b (master) 97de44c9a730fbb5a08d27e6899f7caffb015e66 (0.8.x)
Upstream fixes:
82dd97c4b73ace6 067fbe3fa92a3c7 eb5a95e89b (master) 5a08d27e6899f7c affb015e66 (0.8.x)
97de44c9a730fbb