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