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