.
converted to django1.4, fixes #15