issue #853 permalinks have to been saved again to make this work correctly
Merge branch '853' into hotfixes
Merge branch 'hotfixes' into develop