Sync'd branch integration/inbound with upstream @ Thu Oct 30 16:15:56 PDT 2014