Merge branch 'master' into origin/master

    Conflicts:
        sorl/thumbnail/base.py
        sorl/thumbnail/engines/base.py
        sorl/thumbnail/engines/pil_engine.py