Merge branch 'ubuntu-upstart'