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