Merging remaining webwerkstatt changes for 2.1.3 release to core, part 7
Merging remaining webwerkstatt changes for 2.1.3 release to core, part 7

test fix

LivelyKernel/LivelyKernel,NikolaySuslov/LivelyKernel,NikolaySuslov/LivelyKernel,NikolaySuslov/LivelyKernel,LivelyKernel/LivelyKernel,pascience/LivelyKernel,pascience/LivelyKernel,pascience/LivelyKernel,LivelyKernel/LivelyKernel