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