Sync'd branch integration/inbound with upstream @ Thu Oct  9 11:07:45 PDT 2014