Merge branch 'bjorn-start-stop-2.6.32' into release