Sync'd branch integration/inbound with upstream @ Thu Oct 30 04:38:12 PDT 2014