Sync'd branch integration/inbound with upstream @ Thu Oct  9 09:15:39 PDT 2014