Merge branch 'string_concat_compatiblity' into 'master'

string_concat deprecated since Django >= 1.11

See merge request !22