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