Use older descriptor to support older werkzeug versions
Merge branch '0.10-maintenance'
Merge branch 'master' of github.com:mitsuhiko/flask