Merge branch 'release/releases-1.2.6' into develop
Merge branch 'develop' of github.com:ether/etherpad-lite into release/releases-1.2.6