Sync'd branch integration/inbound with upstream @ Thu Oct  9 00:58:43 PDT 2014