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