Merge branch 'release/releases-1.2.4'
Merge pull request #1337 from ether/release/releases-1.2.4

Release/releases 1.2.4
Merge branch 'master' of github.com:ether/etherpad-lite
Merge pull request #1366 from ether/master

Bring develop up to date with master