Sync'd branch integration/inbound with upstream @ Thu Oct  2 02:47:43 PDT 2014