Merge branch 'bjorn.button' into release