Merge branch 'magma'

Some conflicts, forgot what

Signed-off-by: Alec Ari <neotheuser@ymail.com>