Fixed NPE with setting filter
Merge remote-tracking branch 'origin/master' into MC1.6