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