commit Django
Merge https://github.com/sheregeda/kaplan

test