Bugfixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	service.subtitles.addic7ed/default.py