Merge branch '27-more-news' into 28-applydefine
alternative fix for bug, to avoid more duplication
Merge branch '28-applydefine' into 29