Merge branch 'master' into django2