Sync'd branch integration/inbound with upstream @ Thu Oct 30 08:14:39 PDT 2014