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