Sync'd branch integration/inbound with upstream @ Thu Oct  9 06:17:41 PDT 2014