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