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