[python-django-horizon/f17] (2 commits) ...Merge branch 'master' into f17