Merge branch 'master' into alpha

Signed-off-by: Philip Luyckx <philip.luyckx@gmail.com>
Fix bug: add newline after kick check output

Signed-off-by: Philip Luyckx <philip.luyckx@gmail.com>
Branch from alpha
Merge branch 'beta'

Conflicts:
	version

Signed-off-by: Philip Luyckx <philip.luyckx@gmail.com>