UI cleanup work
unknown messages should cause a warning
Merge branch 'master' into scala_2.11

* master:
  unknown messages should cause a warning
  UI cleanup work