Merge branch 'master' into view/suspended/2008-expedition