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