Merge remote-tracking branch 'dscho/jt/fetch-cdn-offload' into shears/pu

This fixes a problem I reported with Jonathan Tan's CDN patches that
upsets clang.

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho