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