Merge remote-tracking branch 'upstream/master'
Conflicts:
	Amethyst/AMConfiguration.h
	Amethyst/AMConfiguration.m
	Amethyst/default.amethyst