Sync'd branch integration/inbound with upstream @ Thu Oct 16 02:52:42 PDT 2014