merge
Merge branch 'master' of https://github.com/citrtech/djland
Merge branch 'master' of https://github.com/citrtech/djland
Merge branch 'master' of https://github.com/citrtech/djland
Merge branch 'master' of https://github.com/citrtech/djland