Merge old tag 0.6.0 so it becomes part of master again

Otherwise, there's no linear history between this old tag and any new,
future, tags.  This is likely been a manual mistake when I released
0.6.0, so this is corrected now.

rq/local.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# flake8: noqa
 """
     werkzeug.local
     ~~~~~~~~~~~~~~