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