Update magma (4/16/2014)

Signed-off-by: Alec Ari <neotheuser@ymail.com>
Merge branch 'magma'