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