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