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