Merge pull request #81 from openwebwork/ww2.5.1.1

sync Ww2.5.1.1 and master
Merge remote-tracking branch 'openwebwork-dev/master'