Merged in django-swingers-internal:143

--HG--
branch : dev