Updated viewer by adding a blank line.
Refreshed working copy with latest updates from server.
Merge master/master