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