Add support of sorl-thumbnail 11.12.1b
Add watermark before padding
Watermark before padding: use settings & options
Merge remote-tracking branch 'upstream/master'

Conflicts:
	sorl_watermarker/engines/base.py
Remove unneeded import
Merge branch 'infinityxxx-master'