Edit-page for articles: bug fixed
Merge remote-tracking branch 'origin/master'