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