Merge branch 'release/2.0.1' into develop
make django 1.6 not required
Merge branch 'release/2.0.2'