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