Merge branches 'group-option', 'empty-lines' and 'run-without-upstart'