Merge pull request #2994 from obrignoni/2.3/develop

2.3 Fixed page editing