Sync'd branch integration/inbound with upstream @ Thu Oct 16 17:25:39 PDT 2014