Sync'd branch integration/inbound with upstream @ Thu Oct 16 15:48:38 PDT 2014