Commit of changes into EDAM 1.4 made by Jon until 2014-Jun-18.