Sync'd branch integration/inbound with upstream @ Thu Oct 30 07:20:34 PDT 2014