Sync'd branch integration/inbound with upstream @ Thu Oct  9 10:54:42 PDT 2014