Sync'd branch integration/inbound with upstream @ Thu Oct 23 18:52:43 PDT 2014