Merge pull request #235 from menny/master

More work toward v114.