Merge branch 'master' of github.com:ask/celery

Conflicts:
	docs/_ext/celerydocs.py
	docs/userguide/executing.rst