Demo the way Scala210 master can be merged

Hi, Just a demo on direct pull request against master for the master->210merge result