Merge 'master' victorette/django-softmachine

New release with minor corrections