Merge branch 'master' into 'fix_10'

# Conflicts:
#   nxtomomill/converter.py
#   nxtomomill/settings.py
2 jobs for fix_10 in 40 seconds (queued for 2 seconds)