Merge branch 'master' of github.com:Pylons/pyramid
Merge branch 'master' of github.com:Pylons/pyramid
Merge branch 'master' of github.com:Pylons/pyramid
- Work around a bug introduced in Python 2.7.7 on Windows where
  ``mimetypes.guess_type`` returns Unicode rather than str for the content
  type, unlike any previous version of Python.  See
  https://github.com/Pylons/pyramid/issues/1360 for more information.

Closes #1360.