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