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