Build #5

Build: #5 was successful Changes by Andrew Brett

Code commits

Scala mainline/master