EOD 20140528: Working Scala release, tidyup required