Geez I have been up to long

Change-Id: I2324e7cd980e65ce9682219c9e965ee6e8533ca1
Merge remote-tracking branch 'Slim/lp5.0' into lp5.0

Conflicts:
	slim.dependencies