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