Merging work with master

As is prerogative for weekly-or-so merges.  No substantial changes with Work, although on next push should replace .classpath