Sync'd branch integration/inbound with upstream @ Thu Oct 30 07:28:00 PDT 2014