Bugfix
Merge branch 'master' into ruby

Conflicts:
	gifbot.sh