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