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