Sync'd branch integration/inbound with upstream @ Thu Oct  2 12:54:42 PDT 2014