Fixed multi block config
Merge remote-tracking branch 'origin/master' into MC1.6