Sync'd branch integration/inbound with upstream @ Thu Oct 30 13:26:44 PDT 2014