Sync with main SVN repo.

New features include alarm monitoring, alarm filtering, Find (CTRL-F)
and other minor improvements.