Merge remote-tracking branch 'upstream/master' into hooks

Conflicts:
	Makefile
	plugins/00_dokku-standard/commands
	plugins/config/commands