Sync'd branch integration/inbound with upstream @ Thu Oct 23 04:56:39 PDT 2014