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