Make console log handler obey Filters. Closes #866
Fix typo in EntityMap
Merge remote-tracking branch 'upstream/master'