Merge branch 'python_1_6' of bitbucket.org:xordoquy/django-roa into master