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