Merge branch 'issue_494' into 'master'

Upgrade Django 1.11 fix

See merge request !396
.gitlab-ci.yml not found in this commit
Status Job ID Name Coverage
  External
passed cloud