Df master 17

@tgross this cherry picks in the same change and ups the version number.  Ref https://github.com/DramaFever/www/issues/12359