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