Merge remote-tracking branch 'origin/master'

Conflicts:
	module/Melba/language/en_US.po
Merge branch 'master' of https://github.com/gregdeluxee/melba

Conflicts:
	module/Melba/language/en_US.po