Sync'd branch integration/inbound with upstream @ Thu Oct  2 08:14:40 PDT 2014