248 dymola2015

Merge changes for Dymola 2015 to master.