Fix #210
Merge remote-tracking branch 'origin/news' into news