Sync'd branch integration/inbound with upstream @ Thu Oct  9 11:04:38 PDT 2014