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