Merge remote-tracking branch 'origin/master'

Conflicts:
	ddns.py
Del dns
Merge remote-tracking branch 'origin/master'

Conflicts:
	ddns.py