Sync'd branch integration/inbound with upstream @ Thu Oct 16 23:26:42 PDT 2014