Merge branch 'master' of github.com:bradleyayers/django-tables2