Merge remote-tracking branch 'core/master' into schema-alteration

Conflicts:
	django/db/models/fields/related.py

1 files changed, 1 insertions, 1 deletions

diff --git a/setup.py b/setup.py
index 7f848a56ff..b2b7821557 100644
--- a/setup.py
+++ b/setup.py
@@ -93,7 +93,7 @@ setup(
     package_data=package_data,
     scripts=['django/bin/django-admin.py'],
     classifiers=[
-        'Development Status :: 5 - Production/Stable',
+        'Development Status :: 3 - Alpha',
         'Environment :: Web Environment',
         'Framework :: Django',
         'Intended Audience :: Developers',