Sync'd branch integration/inbound with upstream @ Thu Oct 16 11:32:43 PDT 2014