Build #2

Build: #2 was successful Changes by Andrew Brett

Code commits

Scala mainline/master