Sync'd branch integration/inbound with upstream @ Thu Oct  9 13:11:43 PDT 2014