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