Merge branch 'release/releases-1.2.4'
Merge branch 'master' of github.com:ether/etherpad-lite