Sync'd branch integration/inbound with upstream @ Thu Oct 30 02:34:35 PDT 2014