Sync'd branch integration/inbound with upstream @ Thu Oct 30 11:30:38 PDT 2014