Sync'd branch integration/inbound with upstream @ Thu Oct 16 10:56:44 PDT 2014