Sync'd branch integration/inbound with upstream @ Thu Oct  9 08:58:40 PDT 2014