Sync'd branch integration/inbound with upstream @ Thu Oct 16 06:42:42 PDT 2014