Merge remote-tracking branch 'origin/master'

Conflicts:
	GifMaker/src/main/java/at/tripwire/gifmaker/Utils.java
Merge remote-tracking branch 'origin/master'