Merge remote-tracking branch 'upstream/master'

Conflicts:
	minecraft
Merge branch 'master' of https://github.com/alfonsojon/minecraft-init