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