emma peel: > intrigeri: >> Attempting to merge this branch into current master exposes quite
>> a lot of conflicts. Please resolve them and resubmit :)
> this commit can be applied cleanly in master. also passes check_po.sh and a build of the wiki. please pull:
