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