Build #11

Build: #11 was successful Changes by Andrew Brett

Code commits

Scala mainline/master