Synchronising towards version 2.5

Tomasz Wolniewiczrequested to merge
twoln-dev into master

Moving the changes into the master branch

Merge request reports