[Django/f13/master] (6 commits) ...Merge branch 'master' into f13

[smilner]

Summary of changes:

  bbe8dcd... trying dirhtml as a replacement for djangohtml (*)
  a31a71b... updated build of docs for F12+ (*)
  453f644... forgot the actual source in sources (*)
  9322d96... removed the redundant dist check (*)
  8cd8cf2... Updated for upstream release (*)
  2bd3a8d... Merge branch 'master' into f13

(*) This commit already existed in another branch; no separate mail sent