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